From 266ae74afc671a4ec03a3379f9d17fdafca3780a Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Fri, 15 Apr 2016 16:51:29 +0200
Subject: [PATCH] Adwaita: better solid-csd styling

---
 gtk/theme/Adwaita/_common.scss           | 23 +++++++++++++++++------
 gtk/theme/Adwaita/gtk-contained-dark.css | 18 ++++++++++++++----
 gtk/theme/Adwaita/gtk-contained.css      | 18 ++++++++++++++----
 3 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 9b391338a4..8d061a1ce1 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1509,6 +1509,14 @@ headerbar {
       padding: 0;
     }
   }
+
+  .solid-csd & {
+    margin-left: -1px;
+    margin-right: -1px;
+    margin-top: -1px;
+    border-radius: 0;
+    box-shadow: none;
+  }
 }
 
 headerbar {
@@ -4162,7 +4170,7 @@ decoration {
   .csd.popup & {
     border-radius: 0;
     box-shadow: 0 1px 2px transparentize(black, 0.8),
-                0 0 0 1px transparentize($_wm_border,0.1);
+                0 0 0 1px transparentize($_wm_border, 0.1);
   }
 
   tooltip.csd & {
@@ -4173,15 +4181,18 @@ decoration {
   messagedialog.csd & {
     border-radius: 7px;
     box-shadow: 0 1px 2px transparentize(black, 0.8),
-                  0 0 0 1px transparentize($_wm_border,0.1);
+                0 0 0 1px transparentize($_wm_border, 0.1);
   }
 
   .solid-csd & {
+    margin: 0;
+    padding: 4px;
+    background-color: $borders_color;
+    border: solid 1px $borders_color;
     border-radius: 0;
-    margin: 4px;
-    background-color: $backdrop_bg_color;
-    border: solid 1px $backdrop_borders_color;
-    box-shadow: none;
+    box-shadow: inset 0 0 0 3px $headerbar_color, inset 0 1px $top_hilight;
+
+    &:backdrop { box-shadow: inset 0 0 0 3px $backdrop_bg_color, inset 0 1px $top_hilight; }
   }
 }
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 65cef173da..a2de878260 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1929,6 +1929,13 @@ headerbar {
       min-width: 26px;
       margin: 0;
       padding: 0; }
+  .solid-csd .titlebar:not(headerbar), .solid-csd
+  headerbar {
+    margin-left: -1px;
+    margin-right: -1px;
+    margin-top: -1px;
+    border-radius: 0;
+    box-shadow: none; }
 
 headerbar entry,
 headerbar spinbutton,
@@ -4375,11 +4382,14 @@ decoration {
     border-radius: 7px;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); }
   .solid-csd decoration {
+    margin: 0;
+    padding: 4px;
+    background-color: #1c1f1f;
+    border: solid 1px #1c1f1f;
     border-radius: 0;
-    margin: 4px;
-    background-color: #393f3f;
-    border: solid 1px #1f2222;
-    box-shadow: none; }
+    box-shadow: inset 0 0 0 3px #323737, inset 0 1px rgba(238, 238, 236, 0.07); }
+    .solid-csd decoration:backdrop {
+      box-shadow: inset 0 0 0 3px #393f3f, inset 0 1px rgba(238, 238, 236, 0.07); }
 
 button.titlebutton {
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index b0d0f048fc..e76ab44a10 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1936,6 +1936,13 @@ headerbar {
       min-width: 26px;
       margin: 0;
       padding: 0; }
+  .solid-csd .titlebar:not(headerbar), .solid-csd
+  headerbar {
+    margin-left: -1px;
+    margin-right: -1px;
+    margin-top: -1px;
+    border-radius: 0;
+    box-shadow: none; }
 
 headerbar entry,
 headerbar spinbutton,
@@ -4404,11 +4411,14 @@ decoration {
     border-radius: 7px;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
   .solid-csd decoration {
+    margin: 0;
+    padding: 4px;
+    background-color: #9d9d99;
+    border: solid 1px #9d9d99;
     border-radius: 0;
-    margin: 4px;
-    background-color: #e8e8e7;
-    border: solid 1px #a5a5a1;
-    box-shadow: none; }
+    box-shadow: inset 0 0 0 3px #f4f4f4, inset 0 1px rgba(255, 255, 255, 0.8); }
+    .solid-csd decoration:backdrop {
+      box-shadow: inset 0 0 0 3px #e8e8e7, inset 0 1px rgba(255, 255, 255, 0.8); }
 
 button.titlebutton {
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-- 
2.30.2